Merge branch 'hotfix/travis-memcached' into develop
Merge branch 'develop'