merge branch 20130904