Merging dev into master.

Merging dev into master.