Allow settings to be defined before including the variables file
Merge branch 'variable-defaults'

* variable-defaults:
  Allow settings to be defined before including the variables file