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