master-bc-724

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