3.0 merged into master

Working on v3.0 on master channel now, 2.2 has been deprecated.