rollback transaction on error
Merge branch 'master' into RELEASE_20140325