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