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