Merge 3.15 bugfix for 3.16

This commit is contained in:
J. Bruce Fields 2014-05-08 14:58:42 -04:00
commit dd15073a26