Merge of #3402

#3402 

Just doing this to make sure that the docs still builds cleanly with my rebase