Sync'd branch integration/b2g-inbound with upstream @ Sun Nov  2 23:33:48 PST 2014