Merge branch 'resource-option' into 'master'

[click] ResourceOption can be used without ConfigCommand

See merge request !110
5 jobs for master in 8 minutes and 21 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Build
passed #184534
docker
build_linux_36

00:02:29

74.0%
passed #184535
docker
build_linux_37

00:02:30

74.0%
passed #184532
macosx
build_macosx_36

00:07:29

74.0%
passed #184533
macosx
build_macosx_37

00:07:26

74.0%
 
  Deploy
passed #184536
docker
deploy_beta

00:00:52