Updated for v1.1.5
Fix the wrong version number
Updated for v1.1.5
Merge branch 'release/1.1.5'