Merge pull request #147 from mabaiocchi/master_next

More master-next branch changes for pre-1.2 release