F-14: merge bugfixes from trunk/ r818,823
Authored by: r-harrison 2015-08-01
Parent: [r825]
Child: [r827]