master-bc-732

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