Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 23:31:58 PST 2014