Sync'd branch integration/fx-team with upstream @ Mon Sep  8 16:28:38 PDT 2014