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