Merge release changes back into dev.

Merging release 0.6.14 back into dev.