3 commits

Author	SHA1	Message	Date
Zach Brown	189235906d	Update upstream	2016-04-12 11:31:54 -05:00
Zach Brown	a97fe29d9d	Can't expect others to follow formatting if I don't	2016-04-09 13:54:47 -05:00
Zach Brown	4ed5672cd9	Backport a memory cleanup change from 16w14a	2016-04-09 13:50:56 -05:00