I stand corrected, the library needs to know its own restrictions
Merge branch 'refs/heads/ian/DropSupportFor4.3'