Bringing fork up to date with poise/application_ruby master for pull request