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