master-bc-384

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