master-bc-322

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