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