fix up bug in Migrations where Block.Layout was set to EmptyString instead of NULL
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop