Merge pull request #3983 from retronym/merge/2.10.x-2.11.x-20140915

Merge 2.10.x to 2.11.x
Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915
Merge commit '2ac6dc0' into merge/2.11.x-to-2.12.x-20140915
Merge commit '1b98061' into merge/2.11.x-to-2.12.x-20140915