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