Merge branch 'release/0.7.3'
Merge branch 'release/0.7.4'
fix duplicate dependency
Merge branch 'master' into rails4