Final commit before beta 1.2.0 release