master-bc-372

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