master-bc-752

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