master-bc-377

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