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