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