Sync'd branch integration/b2g-inbound with upstream @ Sun Oct 26 23:48:56 PDT 2014