master-bc-737

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