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