Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 09:23:57 PST 2014