Merged 2.8.4 into master

Dev branch is now used exclusively for development builds.