master-bc-279

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