Revert "Revert "Merge branch 'pulls/2'""

This reverts commit 3025a5f7400a180a5fb356a180cec7067f3ebd79.