Final update after latest change request (email: 2014-03-18).