Fix overload tag in YARD docs
Fix marshaling of mixin def node with variable arguments
Fix rubocop line-length errors.
Merge branch 'fix-yard-overloads' into stable

Closes #z1169
Style cleanups.
Add a few more missing option sets.
Merge branch 'fix-splat-marshaling' into stable

Closes #1171
Merge branch 'stable'
Merge remote-tracking branch 'origin/master'