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