bump version for string update
Merge remote-tracking branch 'upstream/master'