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