Squashed commit of the following:

commit 5485aa8f9926a437cdcc69684d742a065a8a9747
Merge: 81f0681 cd02e68
Author: Bob Breznak <bob.breznak@gmail.com>
Date:   Tue Aug 27 11:15:57 2013 -0400

    Merge branch '4-0-stable' into add_options_test_helper

commit 81f06819d0e760f55c0401cfaa1ba5a654f55b0d
Author: Bob Breznak <bob.breznak@gmail.com>
Date:   Tue Aug 27 11:11:41 2013 -0400

    Update ActionPack CHANGELOG

commit bcf3a161292a27bd00e188bb4e96bbd45a2d8021
Author: Bob Breznak <bob.breznak@gmail.com>
Date:   Tue Aug 27 10:27:40 2013 -0400

    Add an OPTIONS helper to test case