master-bc-488

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