update from opscode:master