I synced my fork to the latest 4.5-branch and now everything works. Seems like it was the 1st option. Lucky me. =)