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