Merge branch 'master' into 'fix-220'

# Conflicts:
#   content/evt_tech/2015-04-r-avance-performances.rst
#   content/evt_tech/2015-06-atelier-julia.rst
#   content/evt_tech/2017-01-journee-runtime.rst
2 jobs for fix-220 in 34 seconds (queued for 4 seconds)