3.0 - Master merge

Just keeping up.