Merge pull request #238 from pranavparikh/master

Fixing condition for descriptorSharedParams
Merge branch 'master' of https://github.com/pranavparikh/arrow
Merge pull request #239 from pranavparikh/master

Fix for exitCode not working for unit tests
Preparing for v0.6.1
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/pranavparikh/arrow