master-bc-708

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