master-bc-627

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