merge branch 20130906