Sync'd branch integration/inbound with upstream @ Sun Oct 19 19:56:41 PDT 2014