Fixed bugs #WEB-4806 and #WEB-4807
Merge branch '2013.10.29'