Merge branch 'master', remote-tracking branch 'origin/master'
Added placeholders so that empty fuel log fields will make more sense