Commit bce5c9b78c3cccd56a73454bccba1fd4162a7aa0

eustas 2016-06-16T17:59:04

Merge pull request #378 from eustas/master Fix travis build