Revert "Merge branch 'master' into jpittman"

This reverts commit 347031fc6e2081e4268611b907ae6a2228f098e8.
Revert "Revert "Merge branch 'master' into jpittman""

This reverts commit ca23c92dd0cfe9ff4311ab636469f68a0b99f5ea.
Revert "Revert "Revert "Merge branch 'master' into jpittman"""

This reverts commit aae65a7150c2390697dcde9ef8c0c721262ee2cf.
Revert "Revert "Revert "Revert "Merge branch 'master' into jpittman""""

This reverts commit c4067bc08a78861d8a9220d656af6cd11764f8e0.
Revert "Merge branch 'master' into jpittman"

This reverts commit 347031fc6e2081e4268611b907ae6a2228f098e8.
Revert "Revert "Merge branch 'master' into jpittman""

This reverts commit fe9f5a108b604f2c42a23ef5ef625be51640555c.