Attempt to merge Brandon's branch with master.