- Fixed release build
- Fixed compiler warning
Merge remote-tracking branch 'upstream/master'