Change-Id: I7d4e3ef3fe843d28336c306afa6de0e3450eb733 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>