Sync'd branch integration/inbound with upstream @ Sun Oct  5 10:23:39 PDT 2014