Sync'd branch integration/b2g-inbound with upstream @ Tue Nov 11 08:55:03 PST 2014