Master branch merge for parity across branches and forks.