promoted to core, including fixes

This commit is contained in:
Brian Coca 2016-04-26 10:00:11 -04:00 committed by Matt Clay
parent fa0c10017e
commit 954d650e6a