Merge pull request #757 from Arantor/release-2.1

! Moving drafts around a bit, getting it in the search function too.