Pulled devel into master.

Keeping master current with devel until first release.