Merge branch 'stefanv/pfrancislyon' into 2013.  Closes gh-68.