Merge remote-tracking branch 'cl-fiveam/master' into rt