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