Catch morgan branch up to master

Merge changes to master into morgan branch.