Sync'd branch integration/b2g-inbound with upstream @ Sun Oct 12 21:39:44 PDT 2014