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