Fixes bug where global blocks cache settings were ignored. Looks like the intent was to grab global blocks and merge with local, but we didn't save the resulting merged array.
Fixes bug where global blocks cache settings were ignored.
Looks like the intent was to grab global blocks and merge with local, but we didn't save the resulting merged array.

MichaelMaar/concrete5,avdevs/concrete5,matt9mg/concrete5,MichaelMaar/concrete5,matt9mg/concrete5,TimDix/concrete5,TimDix/concrete5,matt9mg/concrete5,TimDix/concrete5,avdevs/concrete5,MichaelMaar/concrete5,avdevs/concrete5