3.0.99

Good bye 3.0.y.  You will be missed!
Merge remote-tracking branches 'upstream/uber-jb43-backup' and 'origin/uber-jb43' into uber-jb43