pre-merge
226e670d · Merge pull request #514 from rakshasa/feature-travis ·