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