2.1.2

[email protected]

f98b914e · [r=newell-jensen][bug=1516065][author=newell-jensen] Backport trunk r5565: Fix... · Nov 23, 2016

Converted from Bazaar tag '2.1.2' at revision 5555 on branch 2.1.