BG Gilneas: FIXME TODO!
herp
Merge remote-tracking branch 'upstream/4.3.4'