Stabilize to 1.3.0
Merge pull request #2163 from fdlk/master

Stabilize to 1.3.0