Adjust for updated fullframe API
Merge remote-tracking branch 'upstream/master'