Pulling in changes from roostats branch (which I just commited to and synced to master)