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