F-15: Merge bugfixes from trank (r824)
Authored by: r-harrison 2015-08-01
Parent: [r824]
Child: [r826]