Merge branch 'release/20140417'
fix cache error
Merge branch 'hotfix/cache-dir' into develop