update changes (some commits backported to 1.2.x)
update changes (some commits backported to 1.2.x)

guidohcosta/sinatra,frechei/sinatra,jenalgit/sinatra,lastcat/sinatra,sethuster/sinatra,kgrz/sinatra,defsprite/sinatra,siberianbear/sinatra,trexnix/sinatra,sinatra/sinatra,cyberid41/sinatra,jenalgit/sinatra,dariubs/sinatra,Wirachmat/sinatra,autopp/sinatra,frechei/sinatra,twanies/sinatra,porras/sinatra,davydovanton/sinatra,eileencodes/sinatra,d-bot/sinatra,QLGu/sinatra,midorineko/sinatra,kumji/sinatra,burningTyger/sinatra,JonMidhir/sinatra,JonMidhir/sinatra,laplaceliu/sinatra,marocchino/sinatra,nicoayala/sinatra,midorineko/sinatra,dariubs/sinatra,ryanshaw/sinatra,wzheng1/sinatra,trexnix/sinatra,Callygraphy/morrissey,autopp/sinatra,ganmacs/sinatra,Rayheng/sinatra,DoraALin/sinatra,Rayheng/sinatra,mwpastore/sinatra,DoraALin/sinatra,ganmacs/sinatra,jkowens/sinatra,mwpastore/sinatra,JonRowe/sinatra,bmizerany/sinatra,wzheng1/sinatra,blambeau/sinatra,d-bot/sinatra,RosenDimov/sinatra,JonMidhir/sinatra,davydovanton/sinatra,emiliocorpus/sinatra,cyberid41/sinatra,ktw1222/sinatra,sethuster/sinatra,ABaldwinHunter/sinatra-classic,burningTyger/sinatra,emiliocorpus/sinatra,miyazawatomoka/sinatra,Wirachmat/sinatra,twanies/sinatra,ABaldwinHunter/sinatra-classic,siberianbear/sinatra,jkowens/sinatra,nju520/sinatra,laplaceliu/sinatra,ksw2599/sinatra,ryanshaw/sinatra,gferguson-gd/sinatra,jkowens/sinatra,kyontan/sinatra,howtolearntocode/sinatra,gferguson-gd/sinatra,JonRowe/sinatra,porras/sinatra,nicoayala/sinatra,ktw1222/sinatra,sinatra/sinatra,guidohcosta/sinatra,eileencodes/sinatra,ksw2599/sinatra,howtolearntocode/sinatra,mwpastore/sinatra,burningTyger/sinatra,nju520/sinatra,defsprite/sinatra,QLGu/sinatra,kyontan/sinatra,kumji/sinatra,RosenDimov/sinatra,miyazawatomoka/sinatra,lastcat/sinatra