Sync'd branch integration/b2g-inbound with upstream @ Sun Oct 26 20:33:49 PDT 2014