master-bc-391

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