Sync'd branch integration/fx-team with upstream @ Sat Oct  4 15:07:42 PDT 2014