master-bc-339

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