Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 10:26:06 PST 2014