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