Merge branch 'hotfix/20121107Ba'
Merge branch 'release/T20121118'
Merge branch 'release/20130121'
re-enables LDAP authentication (d'oh)
Merge branch 'hotfix/20130122' into develop