moving tag
Merge branch 'master' into v20130612