Sync'd branch integration/inbound with upstream @ Fri Oct  3 21:29:45 PDT 2014