Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) Merge branch 'master' into permit_object