Fast-forward dev to 6.2.3

Dev was out-of-date, so I ff'd it.
Sorry for the unnecessary commits earlier; some of he commands in my new git client are poorly labeled.