Sync'd branch integration/inbound with upstream @ Fri Oct 24 04:57:40 PDT 2014