Sync'd branch integration/inbound with upstream @ Fri Oct 31 08:49:38 PDT 2014