Updates from tsuru:master