Merge branch 'master' into 'fix/override-globalmapping-multiregions'
# Conflicts: # library/MultiRegions/ExpListHomogeneous1D.h # library/MultiRegions/ExpListHomogeneous2D.h
# Conflicts: # library/MultiRegions/ExpListHomogeneous1D.h # library/MultiRegions/ExpListHomogeneous2D.h