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