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