Sync'd branch integration/fx-team with upstream @ Sat Oct 11 19:16:41 PDT 2014