Sync'd branch integration/b2g-inbound with upstream @ Thu Nov 13 05:09:03 PST 2014