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