Merge remote branch 'gravitystorm/relationrevert'