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