master-bc-757

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