master-bc-392

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