Merging 3.0.0 into master

This breaks backwards compatibility