Merge branch 'hotfix/v1.0.0.20141118'
Merge branch 'master' into develop