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