master-bc-369

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