Sync'd branch integration/inbound with upstream @ Fri Oct 31 05:06:40 PDT 2014