enyojs/moonstone — pull request #1816 by graynorton (2014-12-03 01:50:49+00:00)
Title: BHV-18024: 

Cherry-picking from master into 2.5-upkeep.