merge from dotcloud