V1.1.2 better merge

@homebysix please make your changes to the v1.1.2-better-merge branch and then we'll pull it in here.

--Eldon