Merge remote-tracking branch 'richardpl/escape130'