Merge branch 'master' of bitbucket.org:sbgrid/corepublicwiki

mtimony committed 2019-02-07 17:15:44 -0500 commit 1b84f57904812d94a208fdbe9fee1bb75c9d3aa9