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