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