fix timeout error
Merge branch 'release/20140416'