master-bc-276

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