Sync'd branch integration/b2g-inbound with upstream @ Mon Nov 10 22:23:56 PST 2014