Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 00:25:02 PST 2014