Build #187:   Merge branch 'master' into fix-integer-index on branch fix-integer-index over 5 years ago