revert changes
Merge master into testing