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