master-bc-730

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