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