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