I pushed the dbmanul merge branch to master. I will continue to do testing as I bring in more pull requests and fixes to prepare for a 3.6 release.
Let me know if you run into any problems.
Nathan