Sync Beta with Master

Because you had a few changes made to the Master branch, the Beta branch was behind. I went ahead and merged them and this pull request should sync the two branches properly again. If you're planning on following the PB-git model (which I do recommend) then after this point you shouldn't make any changes directly to the Master branch or accept any pull requests into the Master branch. All changes and all pull requests should be made into the Beta branch only. Then, when it's release time, all you'll have to do is merge the Beta branch into the Master branch. (You can do that through the UI. Just click the branch button in the upper right corner of the window next to the sync button, then click the manage / merge button, then drag the Beta branch into the first box and the Master branch into the second box in the Merge section at the bottom of the window.)