Merge master to library-redesign #1474
gramanas:lib-redesign-conflicts was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.
Pushing new commits will allow the pull request to be re-opened.