Merge remote-tracking branch 'upstream/master'
Dissolve extensions to top-level functions
Beta 2 updates