merging nick29581/rust/mod = 974c8aec into auto