drop is no longer included in Chevron
Merge branch 'refs/heads/0.1.3-dev'