Deploying #139, #140

Wald, Lisa A. requested to merge master into production Oct 25, 2017