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