master-bc-701

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