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