master-bc-703

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