Merge branch 'iss84-define-package' into 'master'

Make define-package macro expansion more backwards compatible

Closes #84

See merge request !189
1 job for master
Status Name Job ID Coverage
  Test
canceled Standard pipeline