Merge bd20b1f75a18320c4ea513853f7d8dff28d36170 from master into gh-pages