Sync'd branch integration/inbound with upstream @ Sun Oct 19 12:33:43 PDT 2014