Fix FindOptionalPackage.cmake when plugins is disabled (OS X)
Merge branch 'stable'