Extra files
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix test name
rename to trigger travis build
Merge pull request #247 from mikera/master

Fix for broken build