Sync'd branch integration/b2g-inbound with upstream @ Tue Nov 11 04:38:04 PST 2014