Case #4240 - Standard block
Merge branch '7.x-2.x' of https://github.com/humanitarianresponse/hr_layout into 7.x-2.x