Changes
Testing travis > github releases
Merge branch 'master' into develop