master-bc-355

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