:construction: swapping two sessions due to schedule conflict
Merge branch 'master' into gh-pages