mr: update to 1.20141024
Merge pull request #5084 from henrytill/mr

mr: update to 1.20141024