simplify stash pop bs
fix a bug that if..else are grouped incorrectly
Merge pull request #900 from ruil2/enc_warnings

fix a bug that if..else are grouped incorrectly
Merge pull request #898 from ruil2/enc_rc_4

simplify stash pop bs
Merge remote-tracking branch 'upstream/master' into travis.osx