Change-Id: I42f97f8f629b6ffbf48a01409605853f60a9c02b Reviewed-by: Andrew Knight <andrew.knight@digia.com>