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