Sync'd branch integration/inbound with upstream @ Fri Oct 17 13:26:35 PDT 2014