Merge branch 'release/rel-20130331-1'
Merge branch 'release/BETA3'