Change-Id: Ic5b678af17232c3ebc2da448bb45f97160aa650c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>