merge branch 20130830