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