Merge branch 'js/scalar-global-options'

Scalar update. * js/scalar-global-options: scalar: accept -C and -c options before the subcommand