Merge pull request #2180 from reaperhulk/easy-conditional-fix

create a ConditionalLibrary and remove unsupported items