2015-02-24  Robin Schoonover  <robin@cornhooves.org>

[dd3e5f0071f2] [1.8]
* Merge.


