Sync with coursewa.re master changes.