Sync'd branch integration/fx-team with upstream @ Tue Oct  7 11:28:43 PDT 2014