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