Merge in all changes from primary.

Pulling in all merged changes from MattHodge:master