Cleaned up TODOs in docs.
Merge branch 'master' into development - documentation cleanup of TODOs.