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