merge master into ftr_magstock_txt_fixes