Merge to master to trigger YARD doc updates

@brutski Please merge. 

Want to confirm that YARD docs update to the current docs in RubyDocs.