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