master-bc-469

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