removed outdated TODO (should have been done before release)
Merge branch 'release/20140713-02'