Merge 'pista' branch into 'master'

Merged John Frankland requested to merge pista into master

Merge request reports