merged changes from the devel version post release

Benjamin Mako Hill || Want to submit a patch?