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