Merge master to 2.11.x

master is now retired. 

Here's its final breath:

```
git show origin/master
commit af6941fbcf6f4f4efeb372a9a937463ff630b81c
Merge: 6f33b24 bdb1258
Author: Jason Zaugg <jzaugg@gmail.com>
Date:   Fri May 9 17:21:33 2014 +0200

    Merge pull request #3732 from retronym/revert/5905

    Revert "SI-5905 Clarify test case"
```