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