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