Updated Sinatra 1.4.1
Merge remote-tracking branch 'upstream/master' into super-admin

* upstream/master:
  Updated Sinatra 1.4.1