Merge pull request #144 from mabaiocchi/master_next

Update master-next branch to include pre-1.2 release fixes