Marking as beta like it should have been
Merge remote-tracking branch 'upstream/master'