Sync'd branch integration/b2g-inbound with upstream @ Sun Nov  2 11:54:31 PST 2014