Updates for 2.3.x -- M. Churchfield -- 11 Nov 2014