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