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