Put some variables editable from the editor
Merge remote-tracking branch 'origin/master'