master-bc-398

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