Sync'd branch integration/fx-team with upstream @ Mon Sep 15 16:51:40 PDT 2014