merging
replace-nm-with-gio
2015-12-28, Gary Kramlich