Damn travis-ci. Always new issues. Hope this fix their changes now. >:o
Merge remote-tracking branch 'origin/propel1.6' into propel1.6