Sync'd branch integration/inbound with upstream @ Fri Oct 10 13:22:41 PDT 2014