Sync'd branch integration/inbound with upstream @ Fri Oct 31 02:42:39 PDT 2014