Updated for v1.1.5
Fix the wrong version number
Updated for v1.1.5
Merge remote-tracking branch 'upstream/develop' into develop