Manually merging #1245 into 6.1
Adding defaultflatviewrange settings.ini.cfm attribute