Adding changes from master.

Getting stuff up to date.