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