Fix update scripts to set default value to null not 0
Merge remote branch 'github/master'
Change config.ini from master to 3.6
Rename script update-to-master to update-to-3.6 (change content to 3.6)
Revert "Change config.ini from master to 3.6"

This reverts commit 48271f0a5237038153ac60ade68ea0327393a4ce.