Merge pull request #1574 from stevewithington/develop

bug fix: this.javasettings compatibility