Added note about the hpricot branch [ci skip]
Merge branch 'develop' [ci skip]