Fix #273. Add notes and workaround on delay and timeout API ambiguity
Merge master to dev
Tweak wording, fix typos