Merge branch 'release/1.3'
Merge branch 'release/1.3'
Merge remote-tracking branch 'basho/master' into develop