master-bc-361

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