Sync with the changes pushed by Serge in the last merge window.
authorJames Morris <james.l.morris@oracle.com>
Wed, 16 Jul 2014 16:10:27 +0000 (02:10 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 16 Jul 2014 16:10:27 +0000 (02:10 +1000)

Trivial merge