master-bc-753

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