Pulling Robert's changes over to master

...will copy the BILS updater fix into beta manually.