Final code review changes.
Merge pull request #1 from dkorolev/master

Added CachingMessageQueue.
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master' into FileUploader