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