Sync'd branch integration/inbound with upstream @ Sun Oct 12 21:57:45 PDT 2014