Merged https://github.com/padrino/padrino-framework/pull/1161 changeset