fix https://github.com/technomancy/leiningen/issues/1292
Merge pull request #1293 from kumarshantanu/master

fix https://github.com/technomancy/leiningen/issues/1292
fix #1150 https://github.com/technomancy/leiningen/issues/1150
Merge pull request #1297 from kumarshantanu/master

fix #1150 https://github.com/technomancy/leiningen/issues/1150