Sync'd branch integration/b2g-inbound with upstream @ Sat Oct 25 09:29:08 PDT 2014