Sync'd branch integration/fx-team with upstream @ Fri Oct 31 00:06:08 PDT 2014