Login blocked until correct credentials
Merge branch 'master' into nevan_bb10