Merge pull request #412 from leecoder/0.11-devel

Merge .travis.yml from master to 0.11-devel
Adds missing include.
Merge pull request #415 from povilasb/0.11-devel-fix-includes

Adds missing include.