Merge branch 'feature' into develop

Statsmile 2.1.131127.2a (2.1b1)