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