master-bc-725

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