merge version 130306