Sync'd branch integration/inbound with upstream @ Fri Oct  3 14:01:41 PDT 2014