Minor bugfix and one step closer to Rails 4.1