updated migrate
Merge commit '1f308c50a7e6aa7e34453da0fb4f6829944c5328' into 0.2.1