Dev -- bring in changes that were accidentally mis-committed to the master branch

Dev -- bring in changes that were accidentally mis-committed to the master branch