Merge pull request #82 from ripple/staging

Merge from staging
Merge pull request #84 from ripple/master

Merge pull request #82 from ripple/staging