Sync'd branch integration/inbound with upstream @ Fri Oct 31 16:46:57 PDT 2014