Merge changes from robustness_common
Merge changes from robustness_common

https://github.com/berkmancenter/robustness_common/commit/90d6d39a7b4032bf8d1deb183418ba9fd0c7dd26