Xander's code from March 25 2014
Merge remote-tracking branch 'upstream/master'