Sync'd branch integration/fx-team with upstream @ Sat Oct  4 20:13:43 PDT 2014