Change-Id: I279dcf1ee1c1fe16d3a1fd866af4f9cc4a8c9070 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>