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