Fix: --ssl-key-file option causes a thin/controllers/controller.rb:37:in 'start': wrong number of arguments (2 for 0) error.
Merge branch 'master' into unicorn