Merge branch 'refs/heads/master' into development
flattr
Merge branch 'refs/heads/development'