Merge branch 'dev'
ping travis
Merge branch 'dev'