Sync'd branch integration/inbound with upstream @ Fri Oct 24 05:36:41 PDT 2014