Sync'd branch integration/inbound with upstream @ Fri Oct 31 22:30:28 PDT 2014