master-bc-368

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