Update build number to 31
Merge branch 'release/1.1_31' into development