master-bc-359

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