Rails 3.2.17 update
Merge branch 'master' into aae_filtered
Filter port work in progress