am 3326027d: Merge "Quick compiler: x86_64 workaround"

* commit '3326027d2cc52463db3786a860cf238e8feb349e':
  Quick compiler: x86_64 workaround