merge branch 20130826