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