Sync'd branch integration/inbound with upstream @ Fri Oct  3 12:05:38 PDT 2014