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