DO NOT MERGE
Merge branch 'master' of https://github.com/stefanocasazza/FrameworkBenchmarks

Conflicts:
	.travis.yml