Faces 1566 resource handler 3.1.x

Hi Neil,

hopefully everything is ok in the pull.

Thanks!