Update nokogiri gem (security fix)
Merge branch 'staging'