master-bc-723

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