Merge branch 'develop' into case-1947
case 1947 - More ling is hidden in tagclouds.
Merge branch 'case-1947' into develop