Merge 1.4.5 into develop

Opening this as a PR because there were some merge-conflicts, and I'd appreciate a second pair of eyes on it. I've run all the tests except riak_test, which is running in the background now.