Merge branch 'release/20130702_00'