master-bc-734

http://issues.liferay.com/browse/LIFERAYQA-5553