Fixed Travis error
Merge branch '1.0' into 1.1

Conflicts:
	.travis.yml
Merge branch '1.1'