Import SOFA-Issue 2013-12-02 as revised on 2014-02-20
Merge tag 'SOFA-Issue-2013-12-02r2014-02-20'

SOFA-Issue 2013-12-02 as revised on 2014-02-20
Include new files from the 2013-12-02 issue