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