Sync'd branch integration/b2g-inbound with upstream @ Wed Nov 12 13:14:03 PST 2014