Sync'd branch integration/fx-team with upstream @ Sat Oct 25 19:40:57 PDT 2014