Sync'd branch integration/b2g-inbound with upstream @ Sat Oct 25 20:47:56 PDT 2014