Merge ce14710c0dc5afb7297ad387e1975aa6bbc0e3d3 from master into gh-pages