master-bc-709

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