Revision 2 to JD

Closed Joan Parrow requested to merge jparrow/www-gitlab-com:patch-32 into master