Sync'd branch integration/inbound with upstream @ Fri Oct 17 05:38:43 PDT 2014