Conflicts fixed github-credentials / working-on

 - I am Bob AND I am working on Foo conflict with each other
 - Credentials should follow a stricter match
Merge pull request #694 from Iristyle/patch-14

Conflicts fixed github-credentials / working-on