Change-Id: I32871e3a661319deefe910edf2e3cd51fbf8aefa Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>