Fix issue #3712
Alternative -n option
bug #3716 Fix issue #3712 (umpirsky)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #3716).

Discussion
----------

Fix issue #3712

Commits
-------

90f0a1f Alternative -n option
4446902 Fix issue #3712
Merge branch '2.3' into 2.4
Merge branch '2.4'