Bug fixes and version update
Merge remote-tracking branch 'upstream/master'