Merge pull request #3629 from RosettaCommons/everyday847/new_makerotlib_redux Summarized #1341 for quick merge