Sync'd branch integration/b2g-inbound with upstream @ Thu Nov 13 10:12:01 PST 2014