Sync'd branch integration/inbound with upstream @ Sun Nov  9 22:21:51 PST 2014