Sync'd branch integration/inbound with upstream @ Fri Oct 31 04:27:45 PDT 2014