master-bc-344

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