Sync'd branch integration/inbound with upstream @ Sun Oct 19 02:24:41 PDT 2014