master-bc-706

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