master-bc-421

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