Merge pull request #2163 from fdlk/master

Stabilize to 1.3.0
Snapshot 1.4.0-SNAPSHOT