master-bc-363

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