Merge branch 'release/20130516'