3 commits

Author	SHA1	Message	Date
Zach Brown	14f6bee0a1	Update upstream	2016-04-12 11:31:54 -05:00
Zach Brown	5cbb907ff1	Can't expect others to follow formatting if I don't	2016-04-09 13:54:47 -05:00
Zach Brown	b605f1f95f	Backport a memory cleanup change from 16w14a	2016-04-09 13:48:06 -05:00