Merge branch 'refactor/die-httpoison-die' into 'develop'