Merge branch '16.04' into master-merge

Authored by mardelle on Apr 24 2016, 8:05 PM.

Description

Merge branch '16.04' into master-merge

Merged Changes

CommitAuthorDetailsCommitted
d26bf9382981mardelle
Fix crash on editing speed effect CCBUG: 362187 
Apr 24 2016
453557fdb3b9mardelle
Cleanup audio thumbs creation 
Apr 24 2016