master-bc-739

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