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