Merged the updateCapacity() fix to development
Added a check to prevent null world calls
Added check for 7.0-7.1 Bin crashes
Merge branch 'development' into 1.8