Pulling in upstream changes to my master through web interface

(OS X git mergetool is being a pain remotely; seems to be opening a GUI tool on the machine, which I can't see because it's 10 miles away :) )

Just merging through the web interface; hopefully this works.