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