merge branch 20130902