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