Sync'd branch integration/fx-team with upstream @ Mon Sep 22 00:22:40 PDT 2014