Sync'd branch integration/inbound with upstream @ Fri Oct 17 10:36:39 PDT 2014