master-bc-428

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