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