master-bc-383

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