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