Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 11:38:56 PST 2014