local
Merge branch '2.4' into gh-pages
global
rename
Merge branch 'gh-pages' into 2.4
photo