master-bc-467

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