Yes, that's what I ended up doing, and I was able to compile and run my code!
Merging is a lot stickier doing this though, since 3.2 is very different from master, and most changes are supposed to be merged into master. I think I may have used a second "commit slave" branch off of master and just cherry-picked from my 3.2-based branch to my master-based branch. My change was on animated trees, which was a relatively safe change, but other changes may be riskier.
I'm personally planning on adding more automated tests for my changes (when I get around to adding them) to offset the risk.