NOJIRA: Merge ets/master into pip branch

Good news -- at least this week, merging master's changes was easy!