v1.1.2

Won't auto merge due to conflicts.  Is current.