Merge tag '4.0.5-0.6.el6' into deployment fix #11