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