I blame Google
Merge branch 'jb_42' of ssh://git@bitbucket.org/TeamBAMF/vendor into jb_42