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