master-bc-485

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