master-bc-320

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