Fixed if statement indentation
Only emit warnings if :skip: and :include: are both specified.
Merge remote-tracking branch 'origin/sphinx/add-include-option' into sphinx/add-include-option