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