travis changes
SECRET_KEY
force_text
fix force_text
syntax error
Merge remote-tracking branch 'upstream/master'