master-bc-683

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