Sync'd branch integration/inbound with upstream @ Fri Oct  3 03:05:39 PDT 2014