Merge branch 'hotfix/v2013.11.24.02'
updating description
Merge branch 'hotfix/v2013.11.24.03' into develop