Merge bleeding-edge to master

Merge `bleeding-edge` with `master` to reflect only minute changes that don't affect source code.