master is now 3.1.* compatible, 3.0 has own branch