master-bc-896

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