Add @Inherited to @EnableAutoConfiguration

Fixes gh-1328
Merge branch '1.1.x'