Docdoc
Merge remote-tracking branch 'myhub/master'

Some kind of git glitch ?