Fix option specification.
Fix to interactive mode determination.
Merge branch '1.3.x'