Translated and moved to a proper location a (partial) TODO note
Merge remote-tracking branch 'GitHub/master'