Swapped modifiers
Merge pull request #1363 from rojblake/returnpagefix_fix

use undeprecated modifiers.
Merge remote-tracking branch 'origin/release-1.3.6' into 1.3