master-bc-263

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