.defineOption now supports an array of option names
Merge branch 'develop'