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