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