All branches merged

The development and 3.0 branches are now merged with the master. Ready to got to the upstream.