Moved the functional branch back into master.