merge from thumbor master