commit the updates that are already on the website
Authored by: sneumann 2017-06-08
Parent: [r386]
Child: [r388]