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