pull changes from jake

to fix nimbus.

@paulhagon