Added description of 3.0.4 release.
Started 3.1.
Merge remote-tracking branch 'upstream/master'