Deploying #35 and #36

Wald, Lisa A. requested to merge master into production Sep 13, 2016