Update HTML alias. Closes #1210.
Merge remote-tracking branch 'upstream/develop' into develop