Sync'd branch integration/inbound with upstream @ Tue Oct 14 18:06:43 PDT 2014