master-bc-680

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