Made add_options use variadic templates, not NULLPTR.
Merge branch 'next' into sam_NULLPTR
Merge branch 'sam_NULLPTR' into next